bitkeeper revision 1.709 (40236d4eiuVej1UU9BvAnxpnA814aA)
authorkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Fri, 6 Feb 2004 10:32:46 +0000 (10:32 +0000)
committerkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Fri, 6 Feb 2004 10:32:46 +0000 (10:32 +0000)
Merge scramble.cl.cam.ac.uk:/auto/groups/xeno/BK/xeno.bk
into scramble.cl.cam.ac.uk:/local/scratch/kaf24/xeno.bk

1  2 
xen/drivers/char/xen_serial.c

Simple merge